Added high card, n of a kind; added tests and fixed broken flush tests