Fix tests
Merge pull request #107 from priyankarani/develop

Fix tests