[ALOY-982] Fix ALOY-709 unit test failures
Merge pull request #360 from skypanther/ALOY-982

[ALOY-982] Fix ALOY-709 unit test failures