Small clean-up of tests