Unit tests

Change-Id: I4b2fb152daa6544818bc55de85f5e6d3cce9b583