Committed with few changes in test cases