More work on module support, added test modules and tests for it in demo.mute