Update test data, update test descriptions