Fixed entity tests