Add improved value names, add more testing for deal method.