Complete unit tests for CRUD + necessary updates

Change-Id: I885d527a447037e63116c1e562588e10017f7848
7 files changed