Fix tests and bugs
Merge pull request #37 from olx-inc/sprint-20

Fix tests and bugs