- Focussing on the search API (covers most cases to start with)
- Fixed all tests