updating test suite - rolling back incomplete fix for header order change (header...