Fixed failing unit test from GSIP-113 PR