Merge "Make tests more robust" into sc-v2-dev