Merge "Added a server-pause test"