#4137 Start disentangling persistor and manager
#4137 Fix build of tests