Fixes for tests where modules are missing.