We had several failures in unit tests. Fixing them. Change-Id: I87d69d347298d88e8af587fb95483561f3e48a44