Update test assertions to use the new field labels