Make setup aware of tests
PEP8 fixes