Some changes in functionality with few test cases