get rid of 1-dim transformation. move test methods to test classes.