Fixed Ace valuation in code and test
Merge