Fixing tests and ghost-city?