Introduce workaround for module names that end with "-test" prefix

Introduce workaround for module names that end with "-test" prefix #58