ContextRework AND TestBed2: IN SYNC WITH new-chronotext-toolkit / ResRework BRANCH (COMMIT 491949c)