Fixed tests (according to latest Core changes).