Continued clean-up of tests