Simplified the test configuration