Made additional changes to test_modal