fix a test failure due to nimbus update.
Merge pull request #36 from gcheng/nimbustestfix

fix a test failure due to nimbus update.
Merge pull request #334 from gcheng/dev

Dev