Extracted singleton
Removed dangerous eval, and tests work faster