Updating unittests to pass against current Nova tip

Minor changes to ensure that the unittests continue to pass against
the later OpenStack nova project.

Change-Id: Icd4d65e8735f26386d2da7a1f882e34048449929