work on tests, fixed quite big design bugs in webclient