Enhance tests (simulation, core)