Two new checks are added from #183 based on #149 regarding test
backported from D8:
Please check interdiff file for details.