Minor modifications to test configuration