Unit tests

Change-Id: Ia03c51531862cc41f711acd9e821f800ae217f43