Simplify the command wrapper
Add tests for transformations