Added template tests