OOIION-1358: Added unit test