Ability to cancel transactions (#38)
Clean up some tests