Split body of main content into sub-template
tweaks to unittesting
Fixes for TTORP + cs-content

Hopefully, the change to cs-content won't affect anything else...
previously, the only thing it affected was the unit test page, which got
converted to be NOT using cs-content directly (because that was dumb).
Version bump