(#17) One more fix to failing tests.