refactored finder spec's
filled in all pending tests

Signed-off-by: hajee <hajee@moretIA.com>