fixing unit tests, and prep for v0.4.0
Merge pull request #3 from yahoo/master

refreshing
Merge pull request #187 from proverma/master

fixing unit tests