Fixed z coord in tests. Some tests still need changing