Starting to add tests, yay.