Updated the test for server, delete old ones.