Unit tests

Change-Id: Ifcc21c799ef1081759d3643fa33db65120469494