Expand unit tests, coverage now to 56.9%

Updated to use that object.

PTAL
Thanks!
--brendan