Upgrades, fixed mocking in tests

This changes were made as result
of review in patchset:
https://review.openstack.org/110900/

Change-Id: Idd81a5bc3f2510aca8acdc669ea741b6cfbdd7a4
Merge "Upgrades, fixed mocking in tests"