re-org tests