Cleaned up and restructured the tests folder.