merging test cases
merged
minor changes