Merge more tests
Remove duplicate tests