Added fix for acceptance test by removing race condition