Add Test for OServer restart (see #1667)

Add Test for OServer restart (see #1667)