Cleaned up and restructured the tests folder.
Merge branch 'develop'