[DF-1627] fixed. New unit tests and project files updated.