Added unit test for ERRAI-672