Tests improved with makefile