Removing duplicate tests, cleaning up test naming.