Fix test factory
Merge branch 'fix/test-factory' into staging/master
Add initialize sample data for development
Merge branch 'feature/add-develop-initialize-sample' into staging/master
Merge branch 'staging/master'