Improve toggle between implementation & test