Integrate Raja's unit test modifications with Eelke & Marks work