Fix failing File/Template tests