Configured for testing
Improved test configuration