Add more 'with sexp' for easier debug

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
test: make -verbose even more verbose than before

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
test: clear up some leftover state between tests

This is a problem because some of our configuration is in global
hashtables which aren't being cleared. Once it has all been put
in the store itself, blanking the store will do the right thing
and we can revert this patch.

The unit tests now pass again.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>