Add more discussion and fix group order test