Refactoring & more unit tests

Unit tests for pair, 3 of a kind, 4 of a kind, refactoring