Appease MacOSX for tests.
Fix up unit tests.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>