Refactored testenviroment for further casestudies
Merge remote-tracking branch 'origin/master'