[KW,MS]{test after code} - added some GUI tests
[KW,MS]{merge} - resolved merge conflicts