I think what we're going to discover is that AGI isn't One Thing, it's many Intelligences, and "human level" composite AGI is actually pretty dumb. So we'll make a smarter one, and that'll be the singularity done and over with.
A good test would be whether it can read drawings, get tools and components out of the truck, and wire a house so that it will pass inspection.