More unit tests

Change-Id: Ic4311770d46e14c9bee5eaa128423d1f3300bd76