Trying to fix tests -- more work to do