Third param on request callback is not consistently `entity` or `entities`

[brandonscript]

Third param on request callback is not consistently entity or entities. Need to ensure that if result count > 1, that entities is an array and entity is the first element in the array. Write corresponding tests.