improve test coverage
handle commit/rollback calls in autoCommit mode correctly
Merge branch 'hotfix/0.3.6'