Improve server unittests