Fix bug in unit test.  All tests passing.

Change-Id: I65745e0d9d2279a9979b4a843dc4529aea21111f