new tests, making code more better