Unit tests

Change-Id: I9778a7d4ffaefc45c1c5ed8d772193a82dd7171e