@jdm
Fix unit tests.
4a78da1