Fixed the unit tests from the latest changes