updating functional tests for Waitfor