clean up test as per RP comments