Unit tests

Change-Id: Id6da33978dc5277742f205b9ab47fb6de7fd3138