BAC-508: move testBlock to RenameUser
BAC-508: switch to new helper function