[will squash] Update test expectations
[will squash] Address other review comments