Added find method and tests