Integrate the local server in the server-checking scheme

Testing for a local server is done independently from the other servers (and at least twice). This should be solidified.