Minor bugfixed

- Fixed the synchronization between the vanilla system and the
relationship module
- Fixed MCM entries in the test files