Restitch the project using the fix for module names with extensions and fix up the test to show some controls