Extended the test hypergraph and modified the tests accordingly; also fixed potential bug in the valid ordering component.