Make some more tests pass.
Merge pull request #102 from shans/makeDemTestsPass

Make some more tests pass.