Fix more tests for pocket spec change.