refactored new tests
more tests