Fixing test expected values where 4.0 schema differs from 3.x.
Merge pull request #148 from mkambol/unitTests

Fixing test expected values where 4.0 schema differs from 3.x.