Added test_transform.py to unit tests.
Resolved merge conclicts.