Merge "Tests: Reflect recent changes to MediaWiki import structure"