Add some tests to drive us better