incorporating jails' fix for our tests before it has been accepted by nate