Update tests to reflect changes in the last commit.