Fixed unit tests I broke with last commit.