Bug 32710: Try to prevent UI/Form/Builder/Item.t to fail randomly

Bug 32710: Try to prevent UI/Form/Builder/Item.t to fail randomly

See the FIXME, and commit 77a34e099a9f3bcef2076a4170e8c8d843c403eb
Actually we are doing the trick (of removing _) before we are creating
another itemtype, we need to do it right before we are comparing.

Test plan:
Run in a loop, be patient, it failed for me (without the patch) at run
245

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 4e6bc5385cc262d4a9148e2e5cd2ef2a04032348)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>