Made a pass at cleaning up tests and defined some env vars