Fix incomplete test refactoring
Fix incomplete test refactoring

MockClosure is obviously not necessary and can be replaced with real
closures in all cases.

renan/tactician,RonRademaker/tactician,oswaldderiemaecker/tactician,thephpleague/tactician