reordering some tests