Made makefile better, made tests pass