refactor tests to use consistent test data source