Improved testing routine in Makefile.
Fixed includes in the new test.
Fixed a few tests.
Some still remain unfixed