Make the test-module names canonical. Fixes issues/64