refactored old tests
added new test files