(cleanup) Move server-test back to test folder rather than test