Merge pull request #97 from raghavgautam/master

Fixing more tests