test files moved, a little tests refactoring