Added cleanup code to the testing of build server environment variable