transaction tests; few more improvements