BS-9612 Move tests on SP