Updated tests affected by previous commit.