Moved the test-files to the test-map.
Changed the Makefile to reflect these changes.
Added some small comments on the different "test" files.