Test server improvements