Tests + makefile
Fixed the tests