Add more tests for server-side stuff