[#2] Dj && Greg: Moving tests to specific files and folders.