Fix sporadically failing test
Fix checker framework lint warnings