solving some problems on new WS, changing in some test that wasn`t good