Imporve tests on popups