Fix two unit tests.
Merge pull request #230 from adaptivecomputing/master

Fix two unit tests.