It looks like the testsuite only requires 1 link, not 2 (the default). Can you decorate it saying so? Otherwise this looks good and I've done a testrun. Reviewed-by: Patrick Robb