Add unit tests

Change-Id: I159cc6fc57fa0beb03c0e7b6f657560aacc656a7