ticket:6 moar tests
ticket:6 code test coverage