I think waiting for 6-10 seconds each time we change configuration doesn't make much sense on local setups (testing). we could speed that number of tests significantly just making this timeout shorter.