Updated GUI and tests