Fixed two pair and tests