Merge "Fix Separate test module dependency." into studio-1.4-dev