Remove duplicate tests

I made a complete mess of the last push. It should not have included
duplicates or been to the master branch.

Hopefully this sets things right.