ticket: 1 Modofied Makefile, tests.py, templates
ticket: 3 Ticket 1 changes applied