[api] Adjustments/fixes for non-strict api tests
[api] Merge options.id into data