Clean definitions in Test bootstrap