Refactoring name of persisted storage
Fixing a test that failed in isolation
Tidying up tests that fail in isolation
Refactoring class_name declaration