Moving tests to correct folder
Putting tests in correct location