Update Modulefile and tests