working on tests, new templates, dick removed from blacklist
Merge branch 'testable'
notes toward a template I want; more 'test' framework (well, not unit-testing, yet)