Add tests, change form from being US centric
No more US centric forms