Merge pull request #23 from inoda/test-refactoring

refactored feature tests and transaction model test
Merge pull request #24 from inoda/test-refactoring

Test refactoring