Fixed unit tests broken by the previous commit.