Use test endpoints as default. Add correct info about state of classes

Unification of gateway endpoints.