Lots of spec fixes.

Only two test failures now, but runs and waitsFor are stubbed out.  Also, only 2825 specs total are being run at all. hmmm.