Merge "Remove unnecessary sleep workaround in test"