File template test should only look for files
Merge remote-tracking branch 'spontaneous/master' into kitmonsters