|#479|+Vinay|Fixed bug and modified test related as well