moved items in the test-server for RAII