Cut down on some duplication, and increase test coverage