fixing update NPE
better name for the test
Merge pull request #125 from raghavgautam/master

Small fixes