with some modification in test cases