ticket:8 tests
ticket:8 implementation
Merge branch 't8_tag'