Fix up unit tests.  This should pass