Fix the tests related to bracketed names