Remove duplicate tests
Add utility script