Adjustements to the s2verify xml generation based on the new test credentials
and the changes made to the database.