Refactored test data