Finish rehabilitating controllers/play/read tests