Merge "Add unit test coverage for account generator"