A little bit of work on the testsuite
Further improved templates; removed jade from included extensions.