Fix implicit close brace. Update related test cases