Fixed all server-sided tests, with server-test TODO