Fix accuracy of test
Refactor method
Add assertions