test-server example improved