CAAERS-7078 - fixing tests