vnc unit-test fixes

Change-Id: I6097e45fb2c52a53ac37c6b51abdb432c722e47b