Re-enabled remote server stop. Addressing issues found by test1