Update some unit tests so they pass with the previous commit.