Add more tests and fix transformations