Changeset updated + corrected tests
Merge branch 'develop' into feature/add-power-consumption-and-place-of-collocation