Improve modal test