ENV is now TEST which makes more sense...
derp (fixing option detection)
more derp
Merge branch 'master' into OPS-385