20377: Update Dataspace tests with enhanced studies
Update test to match enhanced studies
Merge branch 'enhance_studies' into develop

Conflicts:
	test/src/org/labkey/test/tests/CDSTest.java