Organization fo tests in new files

-Template organization