Various Changes to Auction and test