Update test data and tests