Merge "Fix tests to run with 1.2.4. DO NOT MERGE." into studio-1.2-dev