added classes with changes from unit testing, checked out from dev
Merge pull request #381 from Wikia/reindexing_fixes_146

added classes with changes from unit testing, checked out from dev