Fixing tests to acommodate new find implementation