ordering of environment-tests
fixed broken test. derp.
merge
Merge remote-tracking branch 'kjetil/master'