Support Switzerland
Add tests