Updated specs to new unified format .. requires new autowrap!
Also exclude a few broken things to trim warnings.