some CR, and test 'fixes'