Fixed a few silly test fails.
Transform fixes to be done.