[test] More test changes