fix unit test bugs

Change-Id: I78f0cc2cca1782e9e0b89f20fc646386870fc6c6
Merge branch 'dev' of https://github.com/davidyuan1989/nova into dev