change the way that common tests can specify which environment they run ...

...in

WIP (failing tests locally, but the tests were unrelated, seeing now if they'll pass on jenkins)