SSP-1991 Fix guard code for consistency in psql file
SSP-1899 Update ChallengeIT test

This commit finishes the ChallengeIT test and updates the data and test with minor changes for ease of testing.