Add the rest of the test cases for the template and add whitespace
fixes.  Fixes #3