Added more iban tests
Minor refactoring