GPII-1045: Updating tests