Internalize dependency on CommonHMAC

Fixes error: "Include of non-modular header inside framework module"
Modular imports
Additional persistence tests
Fix indentation in serialization tests