Unset the environment variable so that we can specify different filenames in the unit test.
Moved some definitons into the header file so that we can reuse them.