Modify test classes for transform tests