Revert "SSP-1849 fixes for ChallengeServiceTest. not all errors fixed. not familiar with code base."

This reverts commit 29b1b5f8b8163d43acfe9fca6d721cff2585987f.

The compilation error this tried to fix did not exist in 2.0.1 and thus
the patch had the opposite of the intended effect.