Refactored Tests to work with new folder structure

-changed the paths