Reorganized tests folder structure