#642: fixed tests