Refactored test fixtures