CHG code quality, use Test* files for py.test