Unit tests

Change-Id: Ieb46c267dd7cd71a3ff83c6e550db44ea80b745a