T10 Fixes to tests in server package