Added test cases for ERRAI-644