Fix json key assertions
Fix checks on challenge response from client