Add tests
Make search testable
Merge branch 'master' of github.com:arshad/kaizoku