Refactor persistable specs