Fixed some tests from the previous commit.