Updated unit tests.

Signed-off-by: Gil Clark <gilclark1@gmail.com>