Adding some tests that I should have written first