reenabled service deadlock test and improved reproducibility