Refactor to allow the use of custom checks for the simulation results