Add tests for finder