More testing to fix NullException with horse entity type