Bug fix @201 : Performance issue while executing tests