More coverage for support modules.