server modified for testing