Remove test task wrapping, add prereq
Subclass the template rendering adapters