Update tests to match latest template changes