Merge "Fix account generator unit tests"