Drop partial search support & add some unit tests