Make tim-testing the same as master