mend unit tests
allow for threeway merges in qube
add test of messy qube case
update requirements file
make transaction id required
skip true duplicate operations
use matchmock module