Add some more transaction tests

And remove 2 else clauses.