Custom transform fixes and test coverage.