ticket:4 Improved tests
ticket:4 Implemented tests, easy