A few improvements done to acceptance test.