Minor changes to the tests, but still running twice
Made persistence implementation configurable
Minor change to allow more styling.