Updated tests per previous commit.