Unreviewed, update 2 more API tests after r230876.