Small fixes in multitest templates