Added simpler transforms and more unit tests.