Begin to add better test coverage