Catch up to some spec changes
Partially re-enable a couple tests