Fix broken unit test after array access merge