Reorganized tests directory