add more zats test cases
minor fix and add more test cases