Merge "Moving some utility tests to instrumentation tests" into sc-v2-dev