WIP fix order content spec coverage