Some more rework on code review test mechanics