Refactored and appended tests. Can't continue, must beer and play Dominion