Merge "Avoid "Column md_module cannot be null" error in unit tests"