DAR-2184 | Fixed unit tests