Merge pull request #183 from leeyt/master

Update ztl testcases