Fix broken unit tests from previous commit.