CLI: Adapt to changed return value of add_multiple().
Interop testing: Add a non-statem interop test.