Fix testnode watching repositories when HEAD is a merge commit

and a few cleanups in test suite

See merge request !1126