added find and filter and tests