Decoupled the TestSettings and made changes to scripts for adjustment.