DAR-1405 Adding implementation for unit test