WSOTWO-126: Added tests