Fix issues with templates [Fixes #4 #3 #2]

Addresses the draper conflict when running the full test suite.
Updates templates for most recent practices.