Break datastorespec into separate tests