Refactored test data fixtures