Modify a test to make sure arguments are getting passed correctly
Clean up how the environments work.
Fixes lots of files problem.  Closes #34