Updates Data with a little bit of javaDoc in addition to updating MockDataStore to get the required complex functions. Updates test's anynomous classes.

Gaffey
Merge remote-tracking branch 'origin/dev-core' into dev-core