Fix incorrect discovery of non-test __init__.py files.
#6197
+29
−41
__init__.py files.
#6197