[test] modify tests to behave with our new default expectations