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

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

Fix tests and bugs
Merge pull request #39 from olx-inc/develop

Develop