Add zero CR test case and fix comments