Refactored templates and added date fields in examples
starting unit tests