Some clean-up of tests