removed reference to self, so that release can be performed. Tests can be executed by passing environment variables if needed.