Added optional SUT for regression; tiddies up env.rb