Cleaning broken tests