rpearce: Default persistent to false, allow it to be overwritten
rpearce: Reduce number of duplicate test, only check parts of the spec
we care about. Not the entire spec (causes duplication in tests)