merge hook tests: fix and update tests