Merge "Removing a dead test" into sc-v2-dev