Added even more unit tests.

Change-Id: If82059a930f636b22a3ea49bc4a80978124e62ec