Updates to template.
Merge conflicts with master
Testing framework scaffolding
Take --testFramework as a command line argument