Fix unit test bulk operations

Change-Id: I46ea0e4c2668e59ca787ae9e68fb8bf660312712