Changed test params to dialog
Gui refactored