transforms rearranged

tests added