Spring cleaning of tests