Adding some missing test coverage