[test] some additional changes