Cleaning up server testing