Added some more unit tests.

Change-Id: Icedcbd5e96043453f467f2bf578ad06aa4a1e75a