small fixes for test
CR fixes
Conflicts fixing
Merge pull request #303 from Wikia/WhereIsMyExtensionFix

small fixes for test