PIM-1718 : re-work flexible unit tests