Fix all server side test

123 tests, 361 assertions, 0 failures