clean up CreateData.java
update mock objects for unittests