Added Tests and Persister