Build out all of the tests!
And they all work... now for the refactor