Added new test program catfile, extended/fixed Makefile