Change the ordering of ranks back to Two..Ace
Modify tests for new bid data type