Unit tests

Change-Id: I7c4cec50c68d7ef7eb9299827001ca09ec9d4385