Fixing tests, removing unnecessary waits