Misc cleanup, disable TestRun