ISPN-3871 Server testsuite fixes