Fix type identification for two pair and corresponding test
Correct hand type decision tree
Move code block constants to methods