Fixes for related module tests