Fixed entity test