Fix failing template tests