Fixing the broken Object Model Tests