More tests and improvements for class 1 transformation