Clean up tests

Fixes most Rubocop warnings