FIX transform tests

Partially addresses issues from recent discussion.