Entity: fixing tests