Fix register a death bug

https://www.pivotaltracker.com/story/show/69999014

Fixed wrong country being shown in outcome.
Small refactoring.
Additional tests.