Refactor and upload test data