BAC-508: move testBlock to RenameUser
BAC-508: switch to new helper function
Merge pull request #1036 from Wikia/BAC-508

Looks good. Merging.