Clearly I need better test coverage...