post-merge fixups

minor changes, manually remove runTestCase from remaining files
lint etc. fixes