Update tests to address last commit.