Expand builder unit test for both db types

Change-Id: Ia2d02195d8ee5eeee891c8f9ca019f4e7c472a91
Merge "Expand builder unit test for both db types"