Unit tests

Change-Id: I29992132d77fef3fdfc98a95d24e4a401c1fe7de