Your first definition would include Wikipedia (or even a printed encyclopedia or other reference material, technically it would include a tape-measure, sorry.). Is Wikipedia intelligent? It is likely both Artificial and General so I think we are there, Skynet is upon us and it is user editable!
This is the difficulty of any definition of intelligence: it fails as soon as it is applied...
2) Compose challenges in which successful criteria exists, without known or obvious established solutions. Grade these by complexity.