ticket: 1 Modofied Makefile, tests.py, templates