tests reorganized