Replace popup-test-with-create-popup to popup-create