Merge pull request #263 from christav/dev

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