Working on getting the tests to work in all environments.