Updates for Patrick's tests