Update some expected results for tests after aa7e32 and 9723d8.