Updated rules and test cases; handle free; Amex still TBD