fixed expected templates