Tweaked template tests to use PEP 8 imports and the new setup_test_template_loader...