Test fixes for Solaris
Merge pull request #204 from mhaskel/content_not_contain

Test fixes for Solaris
Get rid of some extra whitespace in the template
Merge pull request #205 from mhaskel/whitespace_cleanup

Get rid of some extra whitespace in the template