Fix our unit tests so they pass will all the new changes.