Move expectation classed under a expectation cluster, added a new expectation class
for header.