add prefix/suffix; fix transform tests.