Rebuild, fix new broken tests