#591: fixed tests