Merge "Adds foldable annotations to tests" into sc-v2-dev