Minor changes. Started DataCreationTest.