MULE-7728: Fixed several clean up problems related to partitioned object...

... storages.
can Mockito be avoided? is detroing readability