DRY up tests
Persistence