Unit tests

Change-Id: I30985986707d817bcb9d75991a085738c52e6edc