Moving tests into their own folder