Hotfix/dcom 173 tests

This PR introduces tests to avoid epic fails such as #254 and #253 - DCOM-173