OData inlineCount string fix + updated OData tests