ticket:8 add tests and tag