Fixing unit test errors.