Unit tests

Change-Id: I6acdcd3b3016ab7db9f596cbe8d2f439cd53c2a9