Reverts the previous fix to unit test

Two fixes were merged to fix rm3453. This commit reverts one of those.