Refactoring account number and adding missing test