modifications to test and new EnterExitWait implementation