Still working on unit tests.

Change-Id: I94a21efd33ce4e011ca69c88a2ef378e8d7a3735
Still working on unit tests.

Change-Id: I026b2fc3dacf2735c31f23649bfbcd04c30c71b6