More unit tests

Change-Id: If86a9e155b38a6d564f8e56932bfed3a52e2f60e