GPII-20: Removed the exex.exec function and renamed execAndExpect. Replaced else with a return