Update db layer api tests

Change-Id: I10b594d95b148fb9233c040da31c1ba6d9beaf72
Merge "Update db layer api tests" into dev/experimental