Add geographical scopes and tests
Cleanup
Factory linting before tests