Move test templates into files
Remove capture from #text as is not called directly now
Tidy method calls
Expand example in test
More block removal