GPII-75: made tests solution agnostic