Work on templating for example app, fix tests in dev branch, test coverage now 85%