Fixed some unit tests broken by previous commit.