fixed some tests, zs