Revert "Fix Legacy unity tests (including 2 skips & 2 incomplete)"

This reverts commit d5b417d68f9c0a4311b2e6e862b5ae0bb548ec8c.
Change back to return CotnentInfo, but more efficiently
Fix Location and Cotnent Search unit tests skips + incomplete