Makefile updated
Tests started and machina fields updated