Fixed Transform methods, added tests exposing old bugs