More tests and refactoring.

Re: #17
Merge branch 'feature/i17-write-tests' into develop

Conflicts:
	README.md
WIP commit - rebase me.
Emit search response as an object.

And a test. Re: #20