Repo tests reorganization