refactored some tests
moving files