Fixed unit tests that were broken by the last commit