PIM-1252 Fixes tests