fix unit test failures due to media service upgrade.
Merge pull request #29 from gcheng/nimbusfailure

fix unit test failures due to media service upgrade.
Merge pull request #312 from gcheng/dev

Dev