modifying tests according to Dominic's review notes