Update tests to leave the field in a good state