Refactoring, dummy world map and tests