fix(tests): fix test failures caused by merge conflict resolution issue

Signed-off-by: Matthew H. Irby <matt.irby@keyfactor.com>

Author: irby