Rolled Back Config Changes but fixed saving TBM parameters in Timing Test