Minor changes to README.md, instructions for templates
added some tests