Remove unnecessary waits from test