cleaned up test and server