Merge "Re-enable tests for secondary user cases." into sc-v2-dev