GUI finished and tests updated