jlinoff Update to fix the tests