Fix linting issue, removed duplicate tests.

I think this was caused by a bad merge?

r?