Small modifications in the Test file