Added template testing