325733 and 354346 with an additional small modification for other test cases which were not previously run