Tidy up test conversion.