break up tests dir into data, unit tests, and functional tests
more functional/unit tests restructure
add back test lost in the restructure
add back in old tox.ini
Merge pull request #962 from qwcode/tests_restructure

Tests restructure
Merge branch 'develop' into bugfix-git183-v2

* develop:
  add back in old tox.ini
  add back test lost in the restructure
  more functional/unit tests restructure
  break up tests dir into data, unit tests, and functional tests