Delete server tests in system

Moved delete server tests to system based on discussion from @lekhajee