Added unit test. (ABM-169)
Merge branch 'feature-active-xxxx' into develop