Made sure that during one calculation (per location per subsoil per scenario) only the CurrentScenario is used. For Design, all scenarios but the Current are removed at the start of the calculation. For Operational, there only ever is one scenario (as this is a demand which is tested). Replaced use of Scenarios[0] with CurrentScenario, removed Scenarios from Dike. Also removed the reference to Location in DesignScenario, added LocationName to DesignScenario. Adapted all tests for this. I expect two failing (new) tests at the moment.