fixing up broken spec based on new istanbul structure.