Unit tests

Change-Id: I96ed7d29dfd22c24a1e5b20c1eab5d31ea8bba28