Moved test files to upper level, no .. imports, py.test coverage switched on