Adding some tests.
Clean up some bus stuff. SelfHandling contract.