tests reorganized in new directory