Fixes for #89

Needed to handle string only templates for subjects
Added dbo.Nationality_view to csv test case.
Cleaned up unused code.