zs more tests fixed