DAT-2165 Correct tests