More tests added
Updating GUI code.