GPII-941: More tests fixed - only one yet... get token functionality now working again. Fixed inverse capapbilities tests' dependency on the old matchmaker