Shuffle stuff around, split basic API tests from template tests
More shuffling about
List basic tests out of subdir
Add test for {now} template