Updates to modules.js, and updated modules test spec