Clean up eval factory
Fix handling of singleton definitions
Turn off phpunit strict mode because 4.0 is a mess
Add more tests
Be less restrictive on phpunit version