Bnf trim function name and add close bracket
update unit test