WSOTWO-148: Added unit test