updated query tests accordingly to openEHR reference model