semaphore fixes for failing Enterprise Tests