Fixed order entity and order tests: long types of userId and contactId changed on corresponding
 object types