Changed the way subset z-offsets are calculated and modified some tests.