SimulationManager unit tests; other unit tests fixes; SimulationManager refactoring