Update Makefile, .gitignore and tests