On leave commit. Nov 7
Handle some occasional test cases.