Fixing unit tests

A bunch of tests were broken by the recent change
of the aggregation policy, because they relied
on the old policy.

Some other tests stopped working after we upgraded
to a new version of ICU.

Updating the tests accordingly.

Change-Id: I97a785015834632a896ed4fc6079744962c7a04c
8 files changed