reorganized tests folder