Fixes #153 - Updating tests to match template changes.