DG: Added missing unit tests (REF-282)