Clean up. More tests added. New Transformer