Unreviewed, clean up some test expectations after r265639