Merge "Update expectations, tests don't fail."