Refactor test data