INT-60: improved test scenario and existing tests