WSOTWO-138: Added unit tests