Fix register a death bug

Fixed wrong country being shown in outcome.
Small refactoring.
Additional tests.