Re-order post clubs, add test case for it