Make the transformer be an implicit, clean up test with nicer code with that in place