Starting to get the rogue commit handler under test

plus a few other cleanups