Added zones
small bugfixes
Increasing test coverage - and fixing bugs found that way...
added class Guild