fixed unit tests broken with ALOY-862 PR