find* methods updated, last test revision