Added merge unit tests, works for base case and some others
Merge branch 'master' of https://github.com/entangly/jet