reorganized tests