Fixed testing/GUI bugs