[CH,MF]{issue} I22 - Refactored Database, Msg, Testcases