Fix up tests, work a auctions a little