ticket:10 tests
ticket:10 test fixes and implementation