#ZATS-15: add test cases for issues