ticket:8: merge with fixed previous tickets
ticket:8: added tag tests
ticket:8: merge with t8 (added tag tests)