Fix T5327 to work with new primops
Tests for T6135