Modified Makefile, made java files buildable, and add a test clase