test reordering/cleanup