Remove legacy modules
Fix test script