update tests plus reorder options a bit