Export some modules to test
Add tests for MSM