Minor fixes
Add tests for fake name generator