Added file test, fixed makefile