SWITCHYARD-1374

Update GenericForgeTest to match API changes in forge 1.2.2.Final.