Xyz

Fixed a few tests.