DAR-2417: Fixed unit tests