WSOTWO-141: added some tests