Tidy up test expression