test fixes
dependency updates
templates for the template-based tests
a few more test fixes