Fix some tests, get four of a kind working