Updated unit tests after the latest changes.