Added Makefile for both project parts
Fixed initial test