Returns forgotten.
Makefile now properly builds test suite, modified testing files, etc.