Small fixes to the test scripts

The CHP ID changes originated from the setup adjustments during migration to the new host.  The bug in testcase 15 was discovered during testing.