added wait for test
merged from pull