Refactored test configuration