#1581 | Fixing tests mapping issue