BS-9612 Uncomment test after merge