Make test-environment.lua a bit more straightforward.