WIP patch for testBid