Merge "Revert "Separate MediaWiki unit and integration tests""