Fix bad reference to FinderSchema

* Add test for default case
* Refactor other tests
* Remove Plek reference from tests