fixed find method on collection to match id or set of attribute values, added join method to database and unit tests for both