All specs pass again

(Don't include symbols in templates though :/)