TestSuite: Updated several testcases
Removed unused entries in sample config