More cleaning up of tests