Remove redundant wait calls in tests