properly use partials in templates, add test, fixes #1504
Fix tests to check for new spec.rake syntax