actualized TODO
less handlers in test server