Fix Exercise & test optimisation