More test fixes
Remove old stuff

--HG--
extra : transplant_source : %12Q%FC%81%E1%83%CF%F6%21%01%0B%89Y%21%E3%85%DD%9F%10%FE