Fixed a few QA tests depending on GmfScenario
Fixed another test