Update for datastore tests to support multiple datastore types

This resolves some issues with datastore tests
Change-Id: I6065dc763b0e3c7df55986100dff9416401bc97e