Reduce the combinatorial explosion of tests

[G-D-Petrov]

Is your feature request related to a problem? Please describe. There are quite a few tests at the moment, which makes running them take a long time / hard to do locally

Describe the solution you'd like Go over the tests and:

• remove any duplicate tests / ones that test the same functionality
• make sure that we are not testing on more storages than we have to