Fix broken unit tests:

- improve test data generation and cleaning
- make the broken unit tests more close to reality (with better data sets)

Change-Id: Iff97951c026b26e1c7581e2834e9a135e0ee48b0
2 files changed