Minor changes and modification of test cases