Fixed failing tests for MergeCommand and UpdateCommand.
Was already merged in Bitbucket before import, marked as merged by the import user
Done by rewriting 3 tests out of 4 and by ignoring the fourth test due to flawed logic. This completes the task of fixing all tests. All artifacts can now be built.