gui - bug and test fixes