Adding additional datastore tests

This adds 4 more datastore types and versions tests.

Change-Id: I4da3721a764d76e1bd625da69fdef3976edb64d7
Merge "Adding additional datastore tests"