find_content tests and fixes
more test fixes