Simplify tx checks in functional tests to make later commits simpler