added time to close makes the test more stable
Merge remote-tracking branch 'origin/master'