improving tests according to Dominic's notes