Fix modal test message typo
Fix #6884 modal with no backdrop error on close