ticket:9 tests
ticket:9 implementation
Merge branch 't9_management'