minor refactoring: more fake data
Merge branch 'dev'