Fixed the BatterySimulationTest
Refactored some parts of the DishwasherSimulation (deduplication)