MORE PASSING
Merge pull request #104 from shans/makeDemTestsPass2

MORE PASSING