Slight improvements in testing, loading templates