Removed WaitConditions and its handlers for testing