Update tests to match the changes in the last commit.