Merge "Revert "Migrate workspace item adding tests to kotlin"" into sc-v2-dev