Template change to fix bug.
Test fixes.