Clean up service bus assets created as part of test at the end.

Fix for #118

Also found & fixed a potential bug with existing cleanup code.