Unit tests

Change-Id: Iee9539cb10ff9287f4d469415a5d675b1bd15dda