Fix tests to new transformation
Fix compilation errors