Requiring data store interface on demand, fixing some tests