Merging the simulator tests into the main reg model tests (which mostly work by testing with mocked callbacks) would reduce the number of extra files.