Fix a unit test bug.
Merge pull request #269 from adaptivecomputing/master

Merge master into dynamic nodes