Some refactoring and small bug fixes
Added Test for PCMScenario
Made some small changes to Scenario
Added Tests for PCMScenario