tidy up test vars, comments