removed test.settings garbage
tests refactoring