Recurring tests to validate db api refactoring

Change-Id: I7889b41c5ade8cd7235bece3ae0f8bc3cdd8b701
fixes after d7 work

Change-Id: I1bd7e5b5adb5cf0000e602a5e51cfa8314229827