2368: fixed tests