Fixing code review comments

Change-Id: Ib5ec9992567c5d60a6da54cd964982927766792b
Adding placeholder for cloud database unittests

Change-Id: I1f8c20fc562dea2548329d1c450e4c0bfb07124c
Fixing code review comments

Change-Id: I92d43b2bce4ba3715d281e1858f0b367f11bbfd7
working unit tests

Change-Id: Ia7e9b37223392528e344500bbce36f12b7c595c9