refactored all tests