refactoring, extend transformation tests.