Test configuration fixes