Change-Id: I36a13bb651b86bfc14fe5a0a2258f719e6cd2b48
Change-Id: Ib5893440807811f77175ccd347aa3f8ca9cccbdf
Testing interfaces is slightly clearer when it's in the package needing the database rather than each individual implementation. Change-Id: I10334c214a205f7e510b939b4359a2214c4e060a