Added more tests for transaction support.
Updated code to work with api changes
Merge branch 'feature/moretests' into develop