Updates of Makefile and tests formatting