Thanks Barry!  Most of these scripts are part of the core ofono package and thus weren't written by us.  While testing Martin's changes yesterday, I took extensive notes, the result of which will be a few additional patches to push upstream.  I'll add a TODO to review the remaining tests for this construct and fix.