Minor test cleanups
Test updates
Blocked usage of init in the persistence and configuration services to create new instances.