Persistence config instruction refactoring and tests