Fix more tests to work with new primops