Tests passing again. Some weirdness through with my TransformMap